GtkWidget: Update pango context from style context's font description.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 1ceff2d775cf9aa2fb887145f227aad11d01c751..75e01df78b1645ede0eb08c06d912083ea47bebe 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8667,12 +8667,22 @@ static void
 update_pango_context (GtkWidget    *widget,
                      PangoContext *context)
 {
-  GtkWidgetPrivate *priv = widget->priv;
+  PangoFontDescription *font_desc;
+  GtkStyleContext *style_context;
+
+  style_context = gtk_widget_get_style_context (widget);
 
-  pango_context_set_font_description (context, priv->style->font_desc);
+  gtk_style_context_get (style_context,
+                        gtk_widget_get_state_flags (widget),
+                        "font", &font_desc,
+                        NULL);
+
+  pango_context_set_font_description (context, font_desc);
   pango_context_set_base_dir (context,
                              gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
                              PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);
+
+  pango_font_description_free (font_desc);
 }
 
 static void